From 7cfd98e2f11142aa2b036d6f97c0109eb09dd4e3 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Wed, 16 Nov 2005 11:32:19 +0100 Subject: [PATCH] Correctly export xencons functions to avoid ugly 'extern' declarations. Signed-off-by: Vincent Hanquez --- linux-2.6-xen-sparse/arch/xen/kernel/reboot.c | 5 +---- linux-2.6-xen-sparse/drivers/xen/console/console.c | 1 + linux-2.6-xen-sparse/include/asm-xen/xencons.h | 7 +++++++ 3 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 linux-2.6-xen-sparse/include/asm-xen/xencons.h diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c index 81f0f10c21..b403d1e004 100644 --- a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c +++ b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c @@ -15,6 +15,7 @@ #include #include #include +#include #define SHUTDOWN_INVALID -1 #define SHUTDOWN_POWEROFF 0 @@ -29,7 +30,6 @@ void machine_restart(char * __unused) { /* We really want to get pending console data out before we die. */ - extern void xencons_force_flush(void); xencons_force_flush(); HYPERVISOR_sched_op(SCHEDOP_shutdown, SHUTDOWN_reboot); } @@ -42,7 +42,6 @@ void machine_halt(void) void machine_power_off(void) { /* We really want to get pending console data out before we die. */ - extern void xencons_force_flush(void); xencons_force_flush(); HYPERVISOR_sched_op(SCHEDOP_shutdown, SHUTDOWN_poweroff); } @@ -85,8 +84,6 @@ static int __do_suspend(void *ignore) int vcpu_prepare(int vcpu); #endif - extern void xencons_resume(void); - int err = 0; BUG_ON(smp_processor_id() != 0); diff --git a/linux-2.6-xen-sparse/drivers/xen/console/console.c b/linux-2.6-xen-sparse/drivers/xen/console/console.c index fe18653dde..a9f72453a6 100644 --- a/linux-2.6-xen-sparse/drivers/xen/console/console.c +++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c @@ -53,6 +53,7 @@ #include #include #include +#include #include "xencons_ring.h" /* diff --git a/linux-2.6-xen-sparse/include/asm-xen/xencons.h b/linux-2.6-xen-sparse/include/asm-xen/xencons.h new file mode 100644 index 0000000000..4b4909ba91 --- /dev/null +++ b/linux-2.6-xen-sparse/include/asm-xen/xencons.h @@ -0,0 +1,7 @@ +#ifndef __ASM_XENCONS_H__ +#define __ASM_XENCONS_H__ + +void xencons_force_flush(void); +void xencons_resume(void); + +#endif /* __ASM_XENCONS_H__ */ -- 2.30.2